endSessionDialog: Remove the interactivity of the end session dialog

This was always sort of a hidden feature, and with the new designs
it's going to get unclear about what's clickable, and what's not.

https://bugzilla.gnome.org/show_bug.cgi?id=706612

diff --git a/data/theme/gnome-shell.css b/data/theme/gnome-shell.css
index 2c60f13a31c7760a5deb2710cebcb019c9c0690d..5838cde2a0ad5a902da98feb3bfd379079e6c3b5 100644 (file)
--- a/data/theme/gnome-shell.css
+++ b/data/theme/gnome-shell.css
@@ -1934,10 +1934,6 @@ StScrollBar StButton#vhandle:active {
     color: #ccc;
 }
 
-.end-session-dialog-app-list-item:hover {
-    color: white;
-}
-
 .end-session-dialog-app-list-item:ltr {
     padding-right: 1em;
 }

diff --git a/js/ui/endSessionDialog.js b/js/ui/endSessionDialog.js
index c2b74ab07434d03754bfcbda085e6f3b68cb1d70..28c5a67e66d8da754be13208ce180603c60f705f 100644 (file)
--- a/js/ui/endSessionDialog.js
+++ b/js/ui/endSessionDialog.js
@@ -20,7 +20,6 @@
 
 const Lang = imports.lang;
 const Mainloop = imports.mainloop;
-const Signals = imports.signals;
 
 const AccountsService = imports.gi.AccountsService;
 const Clutter = imports.gi.Clutter;
@@ -146,12 +145,11 @@ const ListItem = new Lang.Class({
 
         let layout = new St.BoxLayout({ vertical: false});
 
-        this.actor = new St.Button({ style_class: 'end-session-dialog-app-list-item',
-                                     can_focus:   true,
-                                     child:       layout,
-                                     reactive:    true,
-                                     x_align:     St.Align.START,
-                                     x_fill:      true });
+        this.actor = new St.Bin({ style_class: 'end-session-dialog-app-list-item',
+                                  can_focus:   true,
+                                  child:       layout,
+                                  x_align:     St.Align.START,
+                                  x_fill:      true });
 
         this._icon = this._app.create_icon_texture(_ITEM_ICON_SIZE);
 
@@ -175,16 +173,8 @@ const ListItem = new Lang.Class({
         textLayout.add(this._descriptionLabel,
                        { expand: true,
                          x_fill: true });
-
-        this.actor.connect('clicked', Lang.bind(this, this._onClicked));
     },
-
-    _onClicked: function() {
-        this.emit('activate');
-        this._app.activate();
-    }
 });
-Signals.addSignalMethods(ListItem.prototype);
 
 // The logout timer only shows updates every 10 seconds
 // until the last 10 seconds, then it shows updates every
@@ -469,10 +459,6 @@ const EndSessionDialog = new Lang.Class({
         if (app) {
             let [reason] = inhibitor.GetReasonSync();
             let item = new ListItem(app, reason);
-            item.connect('activate',
-                         Lang.bind(this, function() {
-                             this.close();
-                         }));
             this._applicationList.add(item.actor, { x_fill: true });
             this._stopTimer();
         } else {